Skip to content

Cleaned up and added some new information#71

Merged
harpolea merged 6 commits intopython-hydro:masterfrom
cheginit:master
Feb 13, 2019
Merged

Cleaned up and added some new information#71
harpolea merged 6 commits intopython-hydro:masterfrom
cheginit:master

Conversation

@cheginit
Copy link
Copy Markdown
Contributor

I cleaned up the advection non-uniform solver and removed the redundant test problems, keeping only the slotted problem. Also added the required solver's parameters the solver's inc file. I added my information to the paper as well.

@cheginit
Copy link
Copy Markdown
Contributor Author

The fail is due to flake8. It gives the F405 error for all the __init__.py files.

F_xt.jp(shift_y.v(buf=1)[index], buf=1)[index]))

return F_x, F_y
return F_x, F_y No newline at end of file
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This deletion of the new line is causing flake8 to complain

@harpolea
Copy link
Copy Markdown
Collaborator

This looks like it's because flake8 has been upgraded again - with 3.6 it was fine, but when I run with 3.7.5 I now see F405 errors. I'll fix these on master.

I also see the error

/advection_nonuniform/advective_fluxes.py:126:20: W292 no newline at end of file

  • this is pretty trivial, but would you mind fixing that? Otherwise the changes look good to me!

@harpolea
Copy link
Copy Markdown
Collaborator

Ok, I've fixed all the flake8 F405 complaints now. If you could just fix that other tiny flake8 issue then this should be good to merge

@cheginit
Copy link
Copy Markdown
Contributor Author

@harpolea I fixed the newline problem as well as __init__.py the same way you did. Just one thing, with flake8 version 3.7.5, when I add the newline it gives error W391 meaning that I should remove the blank line at the end on the line! I think they changed things in the new versions and no blank line should be at the end of the file.

@harpolea
Copy link
Copy Markdown
Collaborator

Hmm ok, I think this annoyingly may be something to do with the text editor you're using - sometimes editors add extra newline characters at the ends of files without you noticing. If I view the file on github, there's no extra line, but if I open the raw file in my text editor then there's an extra blank line there. Everything else looks good though so I'll merge then fix that file so flake8 is happy. Thanks for your quick changes!

@harpolea harpolea merged commit 976e869 into python-hydro:master Feb 13, 2019
@cheginit
Copy link
Copy Markdown
Contributor Author

@harpolea Great! I use vim for editing the files. Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants